From: Marco Trevisan (TreviƱo) Date: Tue, 3 Mar 2020 09:05:54 +0000 (+0100) Subject: main: Get the theme resource name from sessionMode X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~761^2^2~5 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7345a6f2762d0876a57b49cf52fb5ecf125b21f2;p=gnome-shell.git main: Get the theme resource name from sessionMode Along the lines of `styleSheetName`, a session mode may want to provide its own gresource file, so make this possible via a `themeResourceName` session mode parameter, defaulted to gnome-shell-theme.gresource https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1063 --- diff --git a/js/ui/main.js b/js/ui/main.js index 05b30d544..6b180bd9b 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -361,7 +361,8 @@ function reloadThemeResource() { if (_themeResource) _themeResource._unregister(); - _themeResource = Gio.Resource.load('%s/gnome-shell-theme.gresource'.format(global.datadir)); + _themeResource = Gio.Resource.load('%s/%s'.format(global.datadir, + sessionMode.themeResourceName)); _themeResource._register(); } diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js index 1c5298770..e12fc2ef4 100644 --- a/js/ui/sessionMode.js +++ b/js/ui/sessionMode.js @@ -15,6 +15,7 @@ const _modes = { 'restrictive': { parentMode: null, stylesheetName: 'gnome-shell.css', + themeResourceName: 'gnome-shell-theme.gresource', hasOverview: false, showCalendarEvents: false, allowSettings: false,